Update ConfirmEdit to master

Change-Id: I13afa3255e02cd2aa53cde301ae8b6988b9296df