Merge "DO NOT MERGE.  Integrate fragment work from master" into honeycomb-mr2