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

* commit '824ce1956f1c4fbf6dcb62bd849e578d5c8b9749':
  Update to catapult ToT.