794d210854
(cherry picked from commit 1dad7aa006492035293e68080aeaf606df02618a) Bug: 204153604 Test: TH Change-Id: I6cc8aef6a0ab9ce4bcef2797196b1d1b3687acca Merged-In: I6cc8aef6a0ab9ce4bcef2797196b1d1b3687acca