Merge "Be more comprehensive about boot time RTC check"