Merge "Move to new Fstab class" am: 12e20e3f2a am: 3184a39837
am: ae50248fc7

Change-Id: Ie0ec0924d605e09f8dfdf4a5036fb44ffcf9689a