Merge "Add (duplicate) license from new XML file"
am: 0a40cb3872

Change-Id: Ia6c24085d91d4c549c0df28ff3006d653a5f4d09