Merge "Update to latest catapult (c69b7871)"
am: cd2d4f530a

Change-Id: If7ca251619faa34d8bd907f924cc5935e7f61012