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

Change-Id: I5969b9ec58b1d9d9baf3f9a9e4bd87678416e469