Bug: 73128633 Test: make checkbuild Change-Id: Id586feef4975be031173e320b64fa9af0ced6fa6 Merged-In: Id586feef4975be031173e320b64fa9af0ced6fa6 (cherry picked from commit 96d98882)