RESTRICT AUTOMERGE CCodec: make config consistent before/after flush am: 04bcc9b67e

Change-Id: I1fe316c16cc50eb6a499aef07197437e0abe1a19