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

Change-Id: I6de1dd5863155a8b1eca165d2730b4dad1fefb74