slab options for swift upgrade

Change-Id: I55f89754a0520b8b88a6016ce183ff4119204311
Merge "slab options for swift upgrade"