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

Change-Id: I50ec8749d1600fafc7c955e6d7d6c67eb748c6e2