Merge "Add a null pointer check to the VcnConfig"