Merge "Do not throw NPE if GRUU uri is not populated"