am 81e88f60: am 6f0516cb: Merge "Refactor DecoderTest" into jb-mr2-dev

* commit '81e88f60a2eb83b3686deb4cb7cae57f3f51d0f9':
  Refactor DecoderTest