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

Change-Id: I52cc32ffa3b6990f19e00e15cc9c7fc600b905ff