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

Change-Id: I6f17a86475a00e3f99dbd32440842c8c4bb23ed6