Merge "Don't use service notifications if we can't."
am: cbcae5af6f

Change-Id: I7721861ff6104c0910a0fb3ab62e4ed1a40bb996