Ensure that a Conflict error is properly handled. Change-Id: Ib468ee953aef0fc54ea88064f88637ed46bc6352 Closes-bug: 1270724