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

Change-Id: I1662143112bf2c0f70f0f940bd7d9bfe39fe7628