Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc
am: 02e71f6245

Change-Id: I0e62e4f6f371aa43eae1a0e5c62787c4e84ddd9a