Merge "Merge "Remove the STH tracking if a model has been aborted." into...
Merge "Merge "Remove the STH tracking if a model has been aborted." into nyc-dev am: 005a84cd am: 8514591a" into nyc-mr1-dev-plus-aosp
am: b5c54990
* commit 'b5c54990':
Change-Id: If3f47f8492e033bf30c109f7a72963c02ad9d765