Fix Notification service build errors

Change-Id: I03d6f5f0ef5d028ae2c641dc3c619cd9b1289b91