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

Change-Id: Iee6c29c26709b8dee43551e553cddd3d9ee225b8