Merge "CDD: Require unqiue device serial number" into mnc-dev