am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."

* commit '47605d10f9647d21c3b350e944fe0d0f5efdc4e6':
  SDK Repository: switch to sdk addon revision 6.