Merge "accounts: resolve error-prone warnings"