Merge "Run compsvc on CompOS boot"