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