Merge "Add test for AVD on SW Layer" into nyc-dev