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

Change-Id: Iec10445efd2039a60650a9c1a4be41039ea95d96