am 2344006b: am 4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev

* commit '2344006b6e43ffd081f55228d150f26d932f15fe':
  Only mark repeated keys as PASS_TO_USER if the original key was.