Updated ConfirmEdit to master.

Change-Id: I5df588bbe5d6158ac8ee2d2254fb1e1f8e4babfe