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

Change-Id: Ibeb30a6b0c5f0b9d3e065b0daa67f01e669b63ea