bug:20222250 Change-Id: Id71847b222b2ec913c148bd88ccf308212fdf1e2 (cherry picked from commit 4b7f7c01)