Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	services/sensorservice/SensorService.cpp

Change-Id: I0ada011496603aeed539d5b2b2b857200a8d2c56