Merge "Update to latest catapult (eae13a4)"
am: 5796f4d84c

Change-Id: I061999e83022fd7518e64b44ed8ff935ce758a6d