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

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

Change-Id: I0c7f6965b8264e9928120dffd370f1df0c9ea646