Merge "Added sleep within testGetAndSetMasterSyncAutomatically." into froyo