Store URI's in Uri instead of String.

Change-Id: I5492a61b80442afc7cebc5b3d560688aebae8820
21 files changed