Merge "Add METADATA to development: Apache2+BSD+MIT+UNICODE+zlib+CC-BY=NOTICE" am: d8af1d3392 am: f648351379 am: f65919ef96

Change-Id: I203747e7a9349c2bce68f87f2c3b0a2992fc03ff