Merge "Handle new ddmlib instrumentation error status"