am 3b175a0b: Merge "Check for accounts when enabling sync features."

* commit '3b175a0b5d1355ed8f220cd39e5b74e9ee565371':
  Check for accounts when enabling sync features.