Merge "hardware: consumerir: Fix time discrepancy" into klp-dev