Merge "Update to latest catapult (1ff7619f)" am: 3b9f71c9a6
am: 1f4523cb80

Change-Id: I13c1a562855e3d1b0ce1057020363d4e1f36769b