Upgrade to Jetpack 2.6