Merge "Update acloud pre-setup to be mac friendly"