Merge "Update CMSO OOM to use HTTPS and AAF"