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

Change-Id: I7eade8cfe87010e36f99b9837e58414f8f3e29ca