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

Change-Id: I86d3ed15cad7336d4250e52061574e12b8bf360e