Relax keyring requirements

Change-Id: Ic8633a493d64b99fd613ea61f5bfb501eaedd7e3