Sync change from Google

A few optimizations, a feature and its subsequent disabling, and a removal of a superfluous warning.