My old email is gone

Change-Id: Icfeccd195b9fbd269dc3400194dd42f215859049
Merge "My old email is gone" into cm-11.0