Merge "Add summary text for Encryption & credential." into oc-dev