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

Change-Id: I4972d6fca6d9e8fdee5f394adabd3792415b30c3