Updated ConfirmEdit to master.

Change-Id: Ia1655f394ebce26cc71df70223af3114da458d3e