am 8ad74177: (-s ours) am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a14f3f2c68cd5a4d71d3f50a892b4811: \'Build SDK repository.\' Do not merge."

* commit '8ad7417748be9a2a1456f55d1e5e4c6484c06f93':
  Merge 2ff496b8a14f3f2c68cd5a4d71d3f50a892b4811: 'Build SDK repository.' Do not merge.