Replace deprecated User::isValidEmailAddr call

Change-Id: I83a0ebd20dc1a78e5389fbfb69cadc55d6516987
Merge "Replace deprecated User::isValidEmailAddr call"