Bug: 69161825 Test: m checkbuild Change-Id: Ic48ec4a3a5125ebc1fe83ae9b23e7696cd7c0cef Merged-In: Ic48ec4a3a5125ebc1fe83ae9b23e7696cd7c0cef (cherry picked from commit fe4a7541)