Merge "Fix boot VTS GetSuffix test" am: 5cd16a71f5
am: 9485e78b93

Change-Id: I7db2fec0f125c6ddc3bdad678bfa34c913f8dacc