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

Change-Id: Ib00e0d6c25ce2529b139d5f18dc269709474c4db