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

Change-Id: I48726108f88abbe3d08973259e1be1a1683df797