Merge "Recovery now expects public keys in zipfile"
am: bfc7d43c00

Change-Id: Iafcfe9a2497803c794327ee5c8bf9b6e1a8e5e8f