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

Change-Id: I6e63b81fd2168780d23a88d7340812b55db98497