Merge remote-tracking branch 'origin/20131025-federated-cloud-contacts' into 20140204-federated-android