Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev