Merge "Fix component management in VrManagerService." into nyc-mr1-dev
am: 964d6914ff

Change-Id: Icff0f300a7157b435fc573f32eff3858cd11be5f