Merge changes from topic "icu63" am: f4ab8b61ec am: 818c18d9b8
am: 1ddd44b026

Change-Id: Ia4a2f35162360eeeb47cfd0c239a6246c3550023