Maintain ordering when alarm removal alters batch bounds

Also: turn off verbose logging, but enable a new debugging
consistency check.

Bug 9965704

Change-Id: Ib20fb8b6275b77ff98291cf12a43b2a1128ab4b9
1 file changed