Merge "Make sure fd is always initialized" into oc-dev
am: b827c5234c

Change-Id: Ifdb14e0d6a79402f8c04fd36b342d1fdfd4a4950