Merge "Add METADATA to unicode: UNICODE+MIT=NOTICE" am: feb5dbfc6a am: 14a6c6a89c am: e0eeaa6f66 am: 35d7caa190 am: d22dfcde8c

Change-Id: Ibc89ea8242768c1d9e75143cac39c6f4101ed0cc