Add option of override for editclaim

Change-Id: Ie90af8a6b480e44169f077ceb1f095969f35c2f6