Bug: 168796046 Test: N/A Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc Merged-In: I57116fe67cbe1322f348c9d0506655f32a900dcc