Merge "switch to using AccountManager instead of GLS"