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

Change-Id: I7e16bb61735596b155d0d3931727193394182f54