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

Change-Id: Idf7c5b89ea14f53336dd51973845500726552dce