Merge "Make AVD thread safe" into nyc-dev