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

Change-Id: If4802db4f03503b44ab641d3733bc6aaa65a72bd