Merge "Merge 2ff496b8a14f3f2c68cd5a4d71d3f50a892b4811: 'Build SDK repository.' Do not merge."