Merge "Revert "Temporarily replace "android.com" accounts.""