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