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: bb587122
am: da7846ae
Change-Id: If0edca2cc2a512d6c0d2dc4d6206068f411edb14