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

Change-Id: I1c779e2a5d8545c1dea1f571d31bfde7dc1a1576