am 315a45e0: am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev

* commit '315a45e085a14884e267c49498e94a316376e212':
  Android 5.0 changes to IME switching