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

Change-Id: I95810035903f64e671f814240aa99520290fd194