Add and enable ZSWAP

Change-Id: If6dee046db9c7ae7de30d25e08a772f9e4a8e36b
Don't show mobile plan preference

Change-Id: I147b574e9e68dc6af004bef31d27e87f1f90d1f7
Merge branch into kk_mkt