Merge "Accept alternative email addresses." am: 0b14739e0f
am: 6dfe4bc16a

Change-Id: I6439166126756b26e43be506130526a9a5c5d08d