Update to latest catapult (1ff7619f)
am: 47f0f1e200

Change-Id: I5e1eca1bafc4dcb0191575c8c4d119151f218a24