Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev am: 73b54bfd6d
am: 8bf30a7826

Change-Id: I48091d9868233f0ef329d0c2db4ffac5bba04eac