Merge "Remove ADT branding from p2 repo" into idea133