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

Change-Id: I1b378ebf26f1be3699a529b7bc301d9cc559f3f2