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

Change-Id: Iff23732d4e722f09d121e90ce21dafc8617af53d