Merge "Replace FakeCompOs with real CompOs"