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