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

Change-Id: I30577f5760dabfc39faa117a9c9f8939b9cad49d