Merge "Update to latest catapult (6171fd4d)"
am: a70bd790df

Change-Id: I0b2a83215b6fa9be493e62332d9f38b60ae6c707