Merge "Revert "nfc(framework): Split non-updatable portion to a separat..."" into main