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

Change-Id: I8dc25a45464c6f8ddfbd910fbe651f3a2a5211b9