Merge "Fix NullPointerException in supp service notify handler." am: 9a7fa0550b am: 4916261479
am: 2158e61a90

Change-Id: I4804a7dec41d355dae706d4fe4613d40790cba7f