Update Keyring Support

This commit updates the status of the Keyring Support feature.

Change-Id: Id7e43850af31c0978ae7658c9c2ced2f625fc137
Merge "Update Keyring Support"