Merge commit '38014a7c' into lmp-dev

Conflicts:
	include/hardware/sensors.h

Change-Id: I21517f717761af7f52c003d535e86059ebb75f05