iOS client side changes for AGPUSH-229