Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f
am: e24e9a0333

* commit 'e24e9a033308d33da0f2517bb4e7b0bbade7efe2':
  Only call finish on operations that have started.

Change-Id: I3679e6e9fb68fe804b4ff645d0fbe4e0b3aff29a