Merge "fs_mgr_overlayfs: De-dup common methods" into main