Merge "[automerger skipped] Be more comprehensive about boot time RTC check am: bfbd98868e am: 998af0bf32 -s ours am skip reason: change_id I36bbe6dfebba79ad83ce536917d6893427a026dd with SHA1 3d65d4d595 is in history"