stable/queens allows SDK >=0.9.19 and <=0.11.3. Somewhere in there the
return text of an exception changed.
Backport portions of Id6de1485bcafb41f238f3e74277094ce64a6acf4 to handle
this change, but modify to work with either text form sice both are allowed.
Change-Id: Ibfee8e1e2ae4eca763894bbee8747297e0fb350f