BUG: 156260178 Test: builds Change-Id: I32f3b7ece78ec8cc97c52a0484151a6a777aa9da (cherry picked from commit edeb081a)