[automerger skipped] Merge "Add null check for vrManager" into pi-dev am: dd7047b4e8
am: 968c247b9a  -s ours

Change-Id: Id6e5c2f2f18464d7a0c2cd3f34daabd385b9bc76