am 64beb278: (-s ours) am 0b71937d: am 5791cecc: b/12068020 Update calls to InputManager. Do not merge

* commit '64beb278983aaa1dbd4115c50cc123be1b0ebc1a':
  b/12068020 Update calls to InputManager. Do not merge