Merge "Add test for Uri.toSafeString" am: 5a6e995881
am: 63d823e08c

Change-Id: Ie3cf50686b232db643cfbb50c2a82f712c54af30