Merge "White-list grandfathered sync adapters" into nyc-mr1-dev