Fixes: 77864901 Test: manual test with AOSP build Change-Id: Ib61052a45c8de1b684527c54d73cfb45ffe672b5