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

Change-Id: I109bd5952643598c5306ab27debb4dd2b30fffed