Merge "Update catapult to latest version (76a241669)"
am: 6e5717f80b

Change-Id: I0fac3a90675c043ff44530bf73b9d4f0d26718a6