Merge "Use the canonical form of the APL2 boilerplate."