Merge \"Include all components in VR initialization.\" into nyc-mr1-dev
am: 0b4750165e

Change-Id: I33a82666674e5bbc2d0e85480c60b3bd4595264e