Merge changes from topic "cherry-pick-dropped-sensor" into qt-r1-dev
am: 1ed27213d0

Change-Id: I3b4c99f626149f3d5b68be8b0e0862f6f7fc2240