Apply crrev/c/5177031

Bug: 304217500
Change-Id: Ib74b816862f4f853b3aeffdb9f1647c11ed3f00f
10 files changed