Merge "ref/profiles/proxy: Move the proxy implementation back into profiles internal."