Merge "Add Notification Flag behavior test"
am: 89bb1971d0

Change-Id: I0948f245fee622b5acd1a1bb414e7a2e20090dc8