Merge "fs_mgr: remount: manufacture a missing / entry for default fstab" am: 4dd15cbe24
am: ad0c249149

Change-Id: I8a8c14cbcc00e79e8640fca0e0680f7a9d966e3e