Merge "Unbundle i18n API from android-non-updatable"