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

Change-Id: Id8962e4b9689243c4a7a2a8236fe93881c0b3692