Merge "Fix NPE's in EasSyncService"