am 8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0

* commit '8408e5165a74ddee7d2d8698314cfda521fbfc76':
  Fix remote device wipe to not hang.