Merge "HIC: Base on elapsed time instead of RTC" into nyc-mr1-dev