am 250c23ee: Merge changes I969261d0,Id764d4e0

* commit '250c23ee12bbadb540b7210bdfe1098f0dadef65':
  EncodeDecodeTest: Add more verbose logging about what decoder is chosen
  EncodeDecodeTest: Remove some unused variables and fields