Bug: 288517951 Test: build Change-Id: I682e553ec8090281ded447780be41a8ea222b084 Merged-In: I15bf3817a8a6867d52f7963a04a69e543a9801e9