BUG: 167962976 Test: TH Merged-In: I64ae039794c33ac907adace6941b2986f3def8af Change-Id: I811ff4e61cda148bb0338e72d236392781ad655b