Merge "Fix long comparison overflow issue in AlarmQueue." into tm-qpr-dev