[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: I21672a55fd37398cd6b1d234a96f765c08536de7