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

Change-Id: I4d0e65e8b36d58ffe8997953c509b13d6594abc4