am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2

* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue