Bug: 69264167 Test: repo sync Change-Id: Ia6fa61f76fec82a5618f287bddeced732305e122 Merged-In: I23b62226f9247d59af1488ec74d8c8d07aa51f9d