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

Change-Id: I6c3975b12499ec67053691059017d27080686039