Merge "Fix NullPointerException in supp service notify handler." into oc-dev