[automerger skipped] Merge "DO NOT MERGE Set the sensor threshold only if...
[automerger skipped] Merge "DO NOT MERGE Set the sensor threshold only if sensor exists" into qt-qpr1-dev am: 140cf2c7 -s ours am: 8a3882d7 am: 6c82b26b am: e1c78b34
Change-Id: I070b9710b0da5f3c51f29867cf7600d3bc5401e2