Merge "Add metrics in AccountManager" into sc-dev