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

Change-Id: I967d7a4db93ca4d5be4998a866aa51ffbb67c611