Merge "Note the release in which functionality was deprecated." into honeycomb