Port swift store

Change-Id: Ie070eb95b22729e30e7ced359e890e69e590d04c
Merge "Port swift store"