Merge "Add @Nullable to return values in Uri" am: cfc6897a39 am: a03c35d74a
am: 68636f2e8a

Change-Id: Iac3c67b843418ca3529be782667c02f4a35fee9c