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