Merge "Add sanity check when loading public keys for OTA package" am: 6793f61795
am: accb42d1b3

Change-Id: I7d66b01eeb8c25339c323d306fc7b8fc4980f9c9