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

Change-Id: I0ee90e535d49ee04e6e26048e6e72e15b44fad17