Android 2.3.1 release 1
am 9031e67b: (-s ours) Fix remote wipe with mobile sync server DO NOT MERGE

* commit '9031e67b7e2ec00033a45155ff644fccb33e6bc7':
  Fix remote wipe with mobile sync server DO NOT MERGE