Merge "Enable GTP_WAA feature"