Merge "Merge "Don't allow using raw public keys to init recovery service any...
Merge "Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev am: b152a8c4" into pi-dev-plus-aosp
am: bef26a2a
Change-Id: Ic1ea494ddaf13bac2fd1a52c1c0961f012906d68