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

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

Change-Id: Idf7f1411cb70eba191748db3a3389062fe1d4baf