BUG: 167962976 Test: TH Merged-In: I19b6b09febeb62867cd3d26246b2b3b46b9422c6 Change-Id: Ia3d5f2201ce67308df8e2689f6c99e28049a4877