am 01a1c6b3: am 30b25399: am d2293196: am bc95d6ee: Merge "hardware: consumerir: Fix time discrepancy" into klp-dev

* commit '01a1c6b3745c3ac8af5a646981817348c5a1b1cb':
  hardware: consumerir: Fix time discrepancy