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

Change-Id: I96e22136db783e51ae4aa6c197911f0a40dd50eb