Update Echo with user notifications trim job

Change-Id: I284e2e344e249df63a4ada83c6cebca507c3b797
Merge "Update Echo with user notifications trim job" into wmf/1.25wmf1