[automerger skipped] Merge changes from topic "cherry-pick-dropped-sensor" into qt-r1-dev am: 1ed27213d0 -s ours
am: 67ab36fbee -s ours
am skip reason: change_id Ic85181abb3edd4c77c427faefa4cd6b9c35b498f with SHA1 1946d87344 is in history

Change-Id: I102de61b398ae610e37c465abf476a7e52321714