Merge "Switch host variant to using ICU direct" am: 18663755e0 am: 32fec772f9
am: 8728e95771

Change-Id: Ie288784a8315535856aeffa9c07a583c28528cf1