Merge "Copy isEmailAddress" am: ed384ad6aa am: a7c70015f3

Change-Id: I9be78275fa7b63e53b6deaaf8715f9b635c245a5