Bug: 73128633 Test: make checkbuild Change-Id: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff Merged-In: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff (cherry picked from commit e3264ba6)