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

Change-Id: Ibd895144f21574c372ac887186491d391ab1212f