Merge "Prefer GCM to CBC or CTR in documentation." into mnc-dev