Merge "GenericSource: close unused file descriptor" into oc-dev am: 76e360332d
am: e941bda697

Change-Id: I793c711309c7c6648f7083db4ce67e5b79696ee5