Merge "Merge "Add Notification Flag behavior test" am: 89bb1971d0 am: dee5f9a738 am: a33e1dd26f  -s ours"