[automerger skipped] Merge "Add transaction code to TimeCheck crash" am: c8cecbe19b am: c91046f7f6
am: 10cfacf02a  -s ours

Change-Id: I2ef14d26e4965153485203ec42cc4a3722077ed5