Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev