bug: 144120587 Test: local build and validation Change-Id: I379f21bb61d7992d6abf5fedd625f4e3050ad0a0 (cherry picked from commit 5ad34e27)