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

* commit '1a7d90c42ad682c8f5c6afc8c4975396380918d5':
  fix a potential buffer overflow in sensorservice