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