Merge "Switch PacUrl storage from String to Uri" am: ab245682f8

Original change: undetermined

Change-Id: I1c2c9f80463f6cdd5c7ee2ad9bdbea3162d2b89e