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: 78199557 am: 6f9a3a35
am: ab55c277
Change-Id: Ia5987e240a988d7caa8d844b7f42da160f607d9f