Merge "Email: Fix StoreTests" am: 6eb899d47c am: c5f58810f0
am: 7cbaf2a659

Change-Id: I38915da6040113fce7efcff53443d665ddfde26b