Merge changes I16312592,Iadfc226e into nyc-dev

* changes:
  Revert "Remove redundant IMM#mServedInputConnection."
  Revert "Make sure to call back reportFinish() on the desired Handler."