Updates brought in from downstream ios repo