[automerger skipped] Merge "Add null check for vrManager" into pi-dev am: c9e2d80ade
am: 31e062e640
-s ours
Change-Id: Ia572567d053c0e00cdafeeae71314187720ff9de
This commit is contained in:
c9e2d80ade
am: 31e062e640
-s ours
Change-Id: Ia572567d053c0e00cdafeeae71314187720ff9de