Merge "Add null check for vrManager" into pi-dev
am: dd7047b4e8

Change-Id: I39fb005c2013085e7104abbc113585b6a465e640