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

Change-Id: Ib48966c671e1cedb7ed1d26498b8389a62e30921