[automerger skipped] Merge changes from topic "cherry-pick-dropped-sensor"...

[automerger skipped] Merge changes from topic "cherry-pick-dropped-sensor" into qt-r1-dev am: 1ed27213 am: 6d4ac268 -s ours
am: bc5000b7 -s ours
am skip reason: change_id Ic85181abb3edd4c77c427faefa4cd6b9c35b498f with SHA1 1946d873 is in history

Change-Id: I3c40ffd9c4dda93a2d5024f87f902599b6228f9b