Merge "Don't sync from adapters that haven't opted in to restricted accounts" into jb-mr2-dev