Merge "Add transaction code to TimeCheck crash" am: c8cecbe19b
am: c91046f7f6

Change-Id: I11aa896ef233a3127e30bf95fafe3603900347f8