Merge "Remove VR package disable logic." into nyc-mr1-dev