am 98ccdc77: Merge "Update to catapult ToT."

* commit '98ccdc774ce8053dd8c3ab351d6d1f2cd37b0303':
  Update to catapult ToT.