Merge "Move to new Fstab class" am: fa3bf1fe55 am: 04c9bb5393
am: 61ce36cc8e

Change-Id: I4c1cd560919d63525b2358dd19d66bf51e0bddc9