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

Change-Id: I118c4b4ba07f0774a59bfcf17b2246713e72b2dc