Fixes: 161606040 Test: atest Change-Id: I8ab108aea23ea6a139f758abdaf222f5f3641104 (cherry picked from commit dfd9f177)