Merge "init start time tracking." am: 601bf9e7c9
am: eefaa1f250

Change-Id: I48d8ec69d0f6cad1ffbd152e253ae4ff4d0eaec9