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

Change-Id: I056c8fbdf6d4392fc34b9e5b318d2e79afe499d9