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

Change-Id: Ie7f182f0d712bb38b0c5d98dbd5ce8cc3fbc6cec