Merge "Fix non-working sent-notification. This is copy of the change reviewed...
Merge "Fix non-working sent-notification. This is copy of the change reviewed (on internal repo) ag/3553436" am: e2c8456f am: a00f3281
am: 8dcb7d34
Change-Id: Ia5987e240a988d7caa8d844b7f42da160f607d9f