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

Change-Id: I7954d85378ff4616c1127dfe2b3e82b0d69b4e5e