Merge change I611c15cf into eclair-mr2

* changes:
  Add DoCoMo vendor specific OMNA WSP content type number     Import CL 145261 from //branches/cupcake_dcm