am c746eec2: am cd644a3f: Merge "Switch to using shared over local code for...
am c746eec2: am cd644a3f: Merge "Switch to using shared over local code for initializing ICU" into mnc-dev
* commit 'c746eec2':
Switch to using shared over local code for initializing ICU