Merge "Update framework from jetpack." into sc-dev