Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
am: 2bbfe98062

Change-Id: I05c5b636f7edec76ab85c4e9b9d248c41acb4157