Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Revert "Check if full name and email edit are allowed in realm" Change-Id: Iea5e80134a0a92066da647d080c7e0a31f6d5eb4