Merge "Add transient to Account (for holding AccountManager account)"