This is more general than the old one... it allows generic editing of all attributes. Change-Id: I308e39034cf206f9cd8e99cb52863a09c2755705