Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am:...
Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f8" into nyc-mr1-dev
am: 75179ada
* commit '75179ada':
Make sure to pause activity before stopping
Change-Id: I5020b92b2edbe0ff749d019fbeb81abf2ae49fe9