Merge "Better error message for AVD" into oc-dev am: cabf9cdc2e am: cab35e9b0e
am: 21d562c122

Change-Id: Id82991e9370a86a6b51372632d7afef1335debd4