[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 am: 4434af1b
Change-Id: Ieabcab92c9f8262a9a9fb3ebe816cfad6cdd4caa