Bug:220175020 Test: Manually verified Change-Id: I3c37228f7142892f2eb45552f2aced51360651af
d42d9a41f6