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

Change-Id: Ib41bd5974041965e8f99ededd5753ef87a9322af