[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: a206d4b4
Change-Id: I87b345bf2a8dae40b7da8b7c3ff731a55bbc777b