am 989c7532: Merge "fix expedited syncs. there were times when an expedited...
am 989c7532: Merge "fix expedited syncs. there were times when an expedited sync wouldn\'t correctly preempt non-expedited syncs" into jb-dev
* commit '989c7532':
fix expedited syncs. there were times when an expedited sync wouldn't correctly preempt non-expedited syncs