am 58d9d419: (-s ours) am 71ad7c8f: (-s ours) Fix SDK repo to prevent mixing different targets. DO NOT MERGE.

* commit '58d9d419eaca2fa15fe6c9411fc7b6da0bdeb118':
  Fix SDK repo to prevent mixing different targets. DO NOT MERGE.