Merge "Fix NullPointerException in supp service notify handler."