Merge "Fix remote device wipe to not hang." into ics-mr0