Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0 am: 216f77451a

Change-Id: Ic9e4be88d94bd7a907a6766e49a6dd684562c41f