Merge \\"Remove VR package disable logic.\\" into nyc-mr1-dev am: b005e0685f
am: b983261885

Change-Id: I49e7e868ea5ca1db3ba6efba25027ecb3874f6e5