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

Change-Id: I46a7ad11a056261188ed1bdc550a8dd70aeb6e0a