DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac  -s ours am: da9246fa5e  -s ours am: 1760d73fbc am: 55d8132edd  -s ours am: 292dc7e025
am: 1dfa590543

Change-Id: I766507dac31afdee5755897fb201a961fba66793