Merge "Add more logs and handling DecoderException"