am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"

Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'

* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
  Enhance WspTypeDecoder to decode Content Type Parameters