Merge "Update ICU version as a part of per-release tasks" am: b645b62f33
am: da256b6915

Change-Id: I66d8c90f40bbaf603ffa4b26dfc53a459184108e