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