am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev

* commit 'dc5b21a54850735bdfd1fbbd83375b2578ed4b02':
  Fix an issue on installing 3rd-party IME by a non-primary user