Merge "Fix Email tests on userdebug builds."
am: daa93cd7ea

Change-Id: I0a2f0ff3bc215947585e09573af985f924e4ce9a