Normalize Uri's for pre jelly bean

Change-Id: I15f4640058fbfa23b26ead6419b8daf6247f61ea