Follow our own Apache

Change-Id: I5f4840fbd33994f126c040cb2f73b0565248aade
Note 2

Change-Id: I78b319d984471452d2b3eaa67726ac08aa75c2ea