MergeAccount: Gracefully degrade instead of throwing an exception

I could have sworn there was a bug for this, but I can't find it now.

Change-Id: If5ed5790d7d8b2849e7b3f8c950a7dc1d50f1f88
Merge "MergeAccount: Gracefully degrade instead of throwing an exception"