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

Change-Id: Ib93112e2f82196499616c3ef68884d1a6a3270ee