Merge "Add null check on serviceinfo"