Merge "Tolerate missing AccountManager resource, not just missing resource name"