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

* commit '713a07c3bd7c937ce5b98db721e5d8ba01f4ccac':

Change-Id: Ib0d6b81fb46404d64cb9c015b3239a825da9d436