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

Original change: undetermined

Change-Id: I05340c235bd6df091ee1ec9e2dd1d846abf07fbb