Merge "Remove the STH tracking if a model has been aborted." into nyc-dev
am: 005a84cd52

* commit '005a84cd526ce2617507763e98400df7c1744a0b':
  Remove the STH tracking if a model has been aborted.

Change-Id: Ic45e6fc2f3c7b8680c73e3290feec54848ec817e