Merge "Fix NullPointerException in supp service notify handler." into oc-dev
am: a9f0885b7f  -s ours

Change-Id: I77f36348776bbf604efc3ada27d0b3ab448bff94