am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: \'Generate SDK Repository XML.\' Do not merge."

* commit '86f738abccb61c820d50a3a50d1fd1f0f2745c84':
  Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: 'Generate SDK Repository XML.' Do not merge.