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

* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue