Merge "New version of SampleSyncAdapter sample code that allows local editing"