Merge "Explicitly include Apache license in LICENSE, etc." am: 56d4e91360
am: 0c9acfc0d1

Change-Id: I0f2d9fe2bd643603704084a40b108b6764a84e3a