Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev