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

Change-Id: I2dab9a87c2eacd56c5f929305987f8f2232fe5ee