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

Change-Id: Ia145a065eabe75e72051287005cd5ab341fe2824