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

Change-Id: Ib23e8b2ed37502af2b088cec2446fb599c69d33b