am 870b4faa: Merge "Fixed that CMAS duplicate detection is not working" into mnc-dev

* commit '870b4faa87c2cc67e2cc214da7ed31693ebb13fc':
  Fixed that CMAS duplicate detection is not working