Merge "Fix infinite AVD not running" into nyc-mr1-dev am: a5dc817c75
am: 186c4e6bed

Change-Id: Ib57dc83e6e2fef341187f5dd97dc6dab19ce2629