Merge "Timetest: Clean up"
am: dcfb201c61

Change-Id: Ie87403c157fda6fb037c20dcc72e1cd14b7b2556