Merge "Fix bug in VTS attestation cert verification."
am: 636650bd84

Change-Id: Ic54e8483cddc9a991565640daaf5c3ffc20d05a6