Merge "Update to latest catapult (e5abb7bd)" am: cf3bd4e
am: 08a35df

* commit '08a35df62811abbff89ca239f64e25add5777838':
  Update to latest catapult (e5abb7bd)

Change-Id: I4b68f06bad6e920991da8832a75324f5c502aa3c