Merge commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7' * commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7': Fixed NPE bugs in Uri. Fixes internal issue #1724719.
Merge commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7' * commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7': Fixed NPE bugs in Uri. Fixes internal issue #1724719.