Merged zap_users and zap_groups

Change-Id: Ibfd32fee3f17213ecab7113f09527e7476edd037