Merge "add access_key to share_access_map"