Merge changes I3ad8bfec,I61902102

* changes:
  Canoncial IME Target (2/N)
  Canoncial IME Target (1/N)