Merge "Fix infinite AVD not running" into nyc-mr1-dev