Merge changes from topic "VulkanCTS-v1-1_180206_LatestUpstream"