Lol, restore aosp email, kufi is doing an amazing job on it

Change-Id: I6d0652cfc25c120e7927708f0acae421312c8127