Merge "Revert "[Ravenwood] Internal clean up, more PFD APIs, OsConstant..."" into main