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
Change-Id: I4b0edff31762ed6b54b549212494f73f5bffe965