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: f2f7bc04" into nyc-mr1-dev-plus-aosp
am: 713a07c3
* commit '713a07c3':
Change-Id: Ib0d6b81fb46404d64cb9c015b3239a825da9d436