Merge "Add METADATA to oauth: Apache2=NOTICE" am: 4791b26f61 am: d1acf194b6 am: faf484d083 am: 0dd1ac4532 am: 64953710f9

Change-Id: I67cd9e4af1cdaa12776c326ba6d3b22739c494fb