Merge "Expose Uri toSafeString api"