Merge "Manually merge the changes made in honeycomb-mr2 to get this on the web."