Changes for OSS move.