Bug: 77905912 Test: Build Change-Id: I720971ce115147b994e27611a0dcf052989180ec (cherry picked from commit 272e8cf8) Merged-in: 272e8cf8