Merge "Update catapult and how we update catapult" am: cd89f5ab72
am: 0261a8b2be

Change-Id: Iaf061da26540fa52e0757069bc0090ab80765a7b