Merge "Allow apps to process ProxyFDCallback asynchrnously." into oc-dev am: 76c32a35a9
am: dfc108a660

Change-Id: I97edd763bac786148a3243ed1e5174d85d49327d