Merge "Use RFC 7217 stable privacy addresses" am: a88b12ce5e am: 4c4d5477d4 am: 8a4667b911
am: 7019b5aa81

Change-Id: I03ddd946247bc9d3b321be4eedf225ad4209e6d4