Merge "Allow use of CompOS on release builds."