Merge "add logging and defensive code when initializing sensors" into ics-mr0