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

Change-Id: I708076932a95f6112ddddd4fb3925be7562124bd