Bug: 241282429 Test: Android builds Change-Id: Ieca39f51efd1de8c02e151bcdac97d6b6103dd55 (cherry picked from commit b573e9e8)