Change-Id: I76d3751c950b1af9065d58b3b740736b3432606d Fixes: 111375261 Fixes: 113312592 Test: rebuild (cherry picked from commit ea945ada)