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

Change-Id: I560a46d6ed8b834196b06f3bdeb29466ca500af7