Merge "Merge "Checks for existence of vr components before trying to disable...
Merge "Merge "Checks for existence of vr components before trying to disable them." into nyc-dev am: 3e38e6ac am: 1aab2f6a" into nyc-mr1-dev-plus-aosp
am: 9e0b1a85
* commit '9e0b1a85':
Change-Id: Id29d52ccb32cd6ae36a790ac6cdf6ed6caea25b6