Merge "(bug 35693) ApiQueryImageInfo now suppresses errors when unserializing metadata"