Merge "Add (duplicate) license from new XML file" am: 0a40cb3872 am: 67a13ffec9
am: 7a8ee1fd6b

Change-Id: Ib3223563fa649749181958b7eb63ca8215aceb12