Merge "Fix the Uri parsing issue" into honeycomb-mr2