[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: 54cc49db
Change-Id: Id38c64bff5a6f452f6c79fe95b7750b3e6195675