Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev