Be more comprehensive about boot time RTC check
am: bfbd98868e

Change-Id: I30758993811d2b682d0ec4fc33a6244773afa3bc