Merge changes from topic 'sensor_looper_crash' into oc-dev am: 638055ef41 am: 642e5511f4
am: bf85c0c670

Change-Id: I3650b2a2d9c9f4c0b4554073c672d7f6282ee814