Merge "Added fix for null check in URLUtilities.java"