Merge "Merge "Better error message for AVD" into oc-dev am: cabf9cdc2e am: 7bbb50e21d" into oc-dr1-dev-plus-aosp
am: 523f7d58fb

Change-Id: I6708d92d5500fb2690a7ab0c196f9215cba332f4