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

Change-Id: I6943aaed41937d6226347d40e3379da1f1cc0125