Merge "Allow smooth upgrade of AVD's from older API's." into nyc-dev