Merge "Revert "Update Framework from Jetpack."" into main