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

Change-Id: I711c7cb360211c873e65378a643dd6b842408935