Merge changes from topic 'sensor_looper_crash' into oc-dev am: 638055ef41
am: 91768a2bfe

Change-Id: Ib1eabf66f2658de1adca4133c20fb4b9fdc71526