Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2