Merge "Expose Uri toSafeString api" am: 17f9b9bfb6 am: 1be68938eb
am: ba104e77e4

Change-Id: I94f7270c90f16254d985a90264aa868005667e07