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

Change-Id: I9f5de6c9685ee3b9cb75369a8465c154bdbc39f5