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

Change-Id: Ie52582381c9c06a615a68b57f683a4d038f437d5