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

Change-Id: I6f5943d005c15629e728dc65f4d478fb0decee8e