Bug: 74619554 Test: Build Change-Id: I3096c67dbd994a5df087d8744934ba3c0b8bf9e3 Merged-In: I3096c67dbd994a5df087d8744934ba3c0b8bf9e3 (cherry picked from commit 6231aaf1)