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

Change-Id: I70f61d4b67dfe43d761929011afbe87047ee080e