Merge "Fix sensor triggering issue" into qt-r1-dev am: fba4296329
am: a740635d8a

Change-Id: Ifb526d2e4eb8ded027dc801265fd456a0d2fe6b1