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: 1aab2f6a
* commit '1aab2f6a':
Checks for existence of vr components before trying to disable them.
Change-Id: I151e8777fb010af5bf5274d64374d8c5995f95a4