Bug: 69061459 Test: repo sync Merged-In: Ie71397c8c5269d2dfdc495bbcb4383b2a8dba63a Change-Id: Ie71397c8c5269d2dfdc495bbcb4383b2a8dba63a (cherry picked from commit 657520445a0e98d51cbb1aa819f6eab7777e2e08)