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