Merge "Sync APIs use seconds instead of ms." into jb-mr2-dev