Merge \\"Quick workaround for a performance regression in IME APIs.\\" into nyc-dev am: 6fe4865e85
am: cb2c497230

Change-Id: I682870edc734bba31c887fce49dce54b1e5cb47c