Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am: 2bbfe98062 am: e9ca3ec441 am: 69bac672b4
am: 7cdeaf53bb

Change-Id: Ie2f8ebef1f87c889b01fe72b5d5395478b353fc1