Merge "Fix retreiving characteristics file for grant key" into oc-mr1-dev
am: 687d8925ff

Change-Id: I6b63f4939a516973357d8b09e0d9dfea6f5b9afa