Merge "DO NOT MERGE" into honeycomb-mr2