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

Change-Id: I774229e9c84e7b390861638e478e2330b66c3d57