Merge "Round up periodic syncs with short frequencies." into jb-mr2-dev