Merge "rate limit notification enqueues" into nyc-dev
am: 585ff8bd12

* commit '585ff8bd126ffac98164a87d24a9add5c23f9597':
  rate limit notification enqueues

Change-Id: I48a05345b210a68e507e648402a2ff19da44b7fc