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: 052383a0
* commit '052383a0':
Change-Id: Idaa9611235d0a78a2012c48d78aea23a64da7189