Sensor fix Part 1

Change-Id: Ife0cad48d71514b79e7496a994b6401f43355671