Merge "Add summary text for Encryption & credential." into oc-dev
am: 65682e7fa5

Change-Id: I47fa8dffba03f8666972843046537dcbededef9c