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

Change-Id: I20980183bc10a9452121e60bbe1ff4148148c11e