Merge "AccountManager: fix updateCredentials API." into nyc-dev