bug: 144120587 Test: local build and validation Change-Id: I379f21bb61d7992d6abf5fedd625f4e3050ad0a0
mentioned in commit 51f01b8f
mentioned in commit 17d69816