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

Change-Id: I5dd41da7ae734e41e80f4366977a466e8117884d