Merge "apex:enabling vping smoke tests"