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