Merge "Add METADATA to oauth: Apache2=NOTICE" am: 4791b26f61

Change-Id: Icfac9931298373635836f5eecd12e0cb0197e8d9