Merge "Merge "Only call finish on operations that have started." into nyc-dev...
Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a8 am: e24e9a03" into nyc-mr1-dev-plus-aosp
am: 2ec07c96
* commit '2ec07c96':
Only call finish on operations that have started.
Change-Id: I0c7f6965b8264e9928120dffd370f1df0c9ea646