Merge "SDK Repository: switch to sdk addon revision 6. DO NOT MERGE." into tools_r22.2