Merge "Update the logs folder to be AAI-SS"