Merge "Fix incorrect cleartext attribute" into mnc-mr-docs