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

Change-Id: Idcef3d820ed36f6b2d373370c835353a8e6859a0