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

Change-Id: I5c5bacff22639e8e5457cc9bfdc9ac728a76473c