Merge "make the notification enqueue rate threshold a setting" into nyc-dev am: 43c3a7e5a7
am: 35f49c5968

* commit '35f49c5968775ea30fdcb859e94e1c816edfcb0d':

Change-Id: I43dcd53660bce93da819458ae1645ad35c58c3ef