Merge "Remove persist.sys.fuse == false code paths"