Merge "Unit test of testIsUnsyncableGoogleAccount failed"