Merge "Merge "bug fix: close file pointer" into oc-dev am: 8735fb45a5 am: 51f04884ba am: 07674691a0  -s ours" into oc-mr1-dev-plus-aosp