Merge changes I969261d0,Id764d4e0

* changes:
  EncodeDecodeTest: Add more verbose logging about what decoder is chosen
  EncodeDecodeTest: Remove some unused variables and fields