Merge "Keep STH state in sync with HAL" into nyc-dev