am c2315525: (-s ours) am 49915373: (DO NOT MERGE) Add SpecialkeyDetector

* commit 'c231552563b168fe7db348f90ed57d7b36269785':
  (DO NOT MERGE) Add SpecialkeyDetector