Merge "Handle failed supplmentary service notifications" am: 535c0a7a50
am: 84674d7a6c

Change-Id: I3c4b27956da72f9d1bb6283c4471f7c17e70b74d