BUG: 167962976 Test: TH Merged-In: Ic89c084604788b4d41cf854e5015c8ce7791c64d Change-Id: I12e326167c6fb61a59a919cdd0198ac8f8c84772