Merge "Fix VHAL VTS issue on GSI image" into sc-dev