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

Change-Id: I678349a113f27a1aa41a404ca97411f2c524a511