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

Change-Id: Iba48c4eb9c125a59c80df51536bda8f29bc51460