Merge "Remove Trace.Pause/Resume." am: 9895094fd8
am: 7dcc1822b8

Change-Id: I7648e8f6a0473b782cb691111585c7579bb2fe8b