Update ConfirmEdit to master

Change-Id: I4004b80247a3bd5675c2835191289fa9eecb7180