Merge \\\"Quick workaround for a performance regression in IME APIs.\\\" into...
Merge \\\"Quick workaround for a performance regression in IME APIs.\\\" into nyc-dev am: 6fe4865e am: cb2c4972
am: f3ab69c3
Change-Id: Ib41bd5974041965e8f99ededd5753ef87a9322af