Bug: 72656027 Test: repo sync works Merged-In: I8cb7d8bd32d4a69eabf676990a82b7a314ef00cc Change-Id: If2946caed1792e1d7ffde97e885222351b0a6313