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

* commit '382966f30cdd800a1812d39b790cad8a04527157':
  SDK Repository: switch to sdk addon revision 6.