[automerger skipped] RESTRICT AUTOMERGE CCodec: make config consistent before/after flush am: 04bcc9b67e am: ff8703f76b -s ours

am skip reason: subject contains skip directive

Change-Id: Ie05868e952c45b4a99e058f1b18469a2d9c7b296