Merge "Use CLOCK_BOOTTIME for default sensor implementation"