Merge "Enable RFC 7217 stable privacy addresses"