Initial flattened checkin of OSS release