Merge "Remove PauseTiming/ResumeTiming calls." am: 1ab86ad3bc am: 71a738b8ab
am: 8975011866

Change-Id: I85236d49431358eeda8d1b5ad2cb3d27f80fe785