BUG: 167962976 Test: TH Merged-In: I30d52c4df571c894b7797300e8f56ddd4b2cc2dd Change-Id: Id343f5a31604abfe70140343bffab20503cd2705