Merge "Checks for existence of vr components before trying to disable them."...
Merge "Checks for existence of vr components before trying to disable them." into nyc-dev am: 3e38e6ac
am: 836bc073
* commit '836bc073':
Checks for existence of vr components before trying to disable them.
Change-Id: I6eb2f6848f6a93ba9e92db17154bd10d043d285d