Merge changes I035c3b9e,Iff1aff3e into udc-dev

* changes:
  Take known Bundle info into consideration for SCData.
  Don't add mapping if no duplicates.