Merge "Email: Fix StoreTests"
am: 6eb899d47c

Change-Id: Ia28dc57f35788161d6f878971962cab8078b2b57