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

Change-Id: I1c1e3a58b668726e674cc2fb2ded3481052e3059