Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo