Merge "Use RFC 7217 stable privacy addresses" into oc-dr1-dev