am 8067b769: (-s ours) Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev

* commit '8067b769f1229e447872f8b03df44b228a662561':
  [DO NOT MERGE] Deactivate H/W keyboard handling