Merge "Fix retreiving characteristics file for grant key" into oc-mr1-dev