vendor: GVM chooser adjustment [1/2]

Change-Id: Iac74a8a72ea13692bdc2d31e92af3802fe831222
78 files changed