Merge "fix a potential buffer overflow in sensorservice" into jb-dev