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

Change-Id: I6eab2c87e9fdfa6b5d6dbe9e4d45006a86cee806