Merge "TransformFstabForDsu() skips handling special devices"