am 37321fde: merge from open-source master

Merge commit '37321fdeeffc707cb33bd433dca27f18c205d1fe'

* commit '37321fdeeffc707cb33bd433dca27f18c205d1fe':
  kcm tool fix for the keyboard output permissions