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

Change-Id: Ia1645886356db3f147ffeef4fac2aecf5d05c232