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

Change-Id: I9aa34c701c165c4b37ff580a0c70668f8665e7f8