Merge branch 'stable-3.0' * origin/stable-3.0: Fix compilation error: use accessor for preferredEmail Change-Id: I885f9d1b80acc3f824c847bde85108be6ead9e0d