Standard swift-proxy

Change-Id: I5022a0475e8a4a57d3fe1df333452834706bcd76
Merge "Standard swift-proxy"