[automerger skipped] Merge "Update to latest catapult (625dca847)" am: 8b0d177e92 am: f457f9cfcc
am: 422f02e3ef  -s ours

Change-Id: I00fba343abe68e4474520f977aebb6d8a98ddf54