Merge "add comment to deprecated tag" into honeycomb-mr1