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

Change-Id: I9577b95776c7c2022ddc25ae5f59da0f8b5f47eb