Merge "Fix problem with getDefaultAccountId() with no explicit default"