Merge changes If834d0f0,I05ec75c7 into pi-dev

* changes:
  Add null check for vrManager
  Add null check for vrManager