Merge "Remove Flags.NOTIFICATION_UPDATES which is cruft from SC"