Merge "Fix a stack corruption in sensorservice" into jb-dev