Merge "Align inexact alarms in both time bases; don't pull to wall time"