Merge "Properly setup autoMirror in VDC and AVDC." into nyc-mr1-dev am: 69086d06d0 am: 1e2a25fbf4
am: 13ad6a16b7

Change-Id: I25383c945889c77f8d0c9479937113c3824c9942