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

Change-Id: I98caf6c319a21ebd5f85c1c740691ddcd31894ba