Fix the behavior for metadata verification when no public key presents am: 6c70b934f2 am: 40bf7c184e
am: 2293b1a2ba

Change-Id: Ia45b753ef2595332c9071d77af5c2cbd0932b842