Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev