Merge "Use RFC 7217 stable privacy addresses"
am: a88b12ce5e

Change-Id: I3b79ecd87233db0b4242e8c02355d83686d27e6e