[automerger skipped] Merge "Support changing the NAT64 prefix without removing it." into rvc-dev am: 6f2a54e75e -s ours am: 5f0041e1a0 -s ours am: bcac17aa68 -s ours
am skip reason: Change-Id I789fe9d46d3ac5d074ae697d23013f24a9e0246d with SHA-1 aa0c7d00cf is in history
Change-Id: I3739e103c93fde00e1cb7985ff20a2a8bfe0b1fa
This commit is contained in: