81f7d0bbf5
This cherry-picks ag/20484685 to QPR to mitigate future merge conflicts. Bug: 238475284 Test: m -j Change-Id: Ie13c738d0d4a10f4265fbf116ff7b4206d3bfc62