Merge "Update Framework from Jetpack." into tm-dev