Merge "CCodec: make config consistent before/after flush" am: d7ff318457

Change-Id: I420eab5e2187073b00fc6b50e589dff913da87af