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

Change-Id: I4e361ec71856b572220bfebf47a62965ef79786f