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

Change-Id: Ic6a93cb5f51f0011696beaa022318fb1b50c5976