Merge "Fix pinned slices returning different Uris." into pi-dev
am: b672c1f97c

Change-Id: If07c9fb4b3391cce7c555430ffb5b0fbdb760777