Merge "Temporarily disable AVD on RT" into nyc-dev