Merge "Support mounting same mount points with different fstab config"