am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets."

* commit '087ccb01527d9d7e8981751639c65b1eb6369534':
  Fix SDK repo to prevent mixing different targets.