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

Change-Id: I4710374027dc5f80c1a3f825af31da3e4be00ef3