Merge "Update to latest catapult (625dca847)"
am: 8b0d177e92

Change-Id: Ib8e9b3f773f9abc36565ec89b971098b0f8a0ac1