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

Change-Id: Ib7aa75882fb1b8d3c3380ec680969abe252cbff1