Merge "Properly setup autoMirror in VDC and AVDC." into nyc-mr1-dev