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

Change-Id: I96b7ac9525e4096da2662f1c1973e2ee52008cfc