Merge "Add AccountInfo to the cloud provider API" into sc-mainline-prod