am 7f651969: Merge "fix a potential buffer overflow in sensorservice" into jb-dev

* commit '7f6519691fdd8062a090de74cfc5d2a906f9e5f6':
  fix a potential buffer overflow in sensorservice