Merge "Update to latest catapult (be85e5fd)" am: 6c00c34066
am: 32fc235614

Change-Id: I2a0eebee67bc457865d4e105c71670093a3b1106