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

Change-Id: Ic26781983387c1ddee683cb88ff0f1134d6c658a