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