Fixes: 160781930 Test: manual Change-Id: Ic3b43bb8247c6a7ebe4257651bcb5de51699c60a Merged-In: Ic3b43bb8247c6a7ebe4257651bcb5de51699c60a (cherry picked from commit dffcc471)