Merge "Add APIs to allow detection of encryption type"