Merge "Fix NPE when the vr manager isn\'t around at first." into nyc-dev
am: 1e79be9

* commit '1e79be9f0a6595cfd3cfadb272e2692197098767':
  Fix NPE when the vr manager isn't around at first.

Change-Id: Ie0af1a0404aee098b4d2c7e3d884ad45bce7543d