Merge "Sensor: Make switching from data injection mode to normal mode more productive" am: e6a4e9b04e am: 33685d3a84 am: 0674efdbfa
am: 85171c016e

Change-Id: I4db1bfa247779e46ca57117df8fc1ee5240c95e3