Merge "fstab files: update to mount cache with noatime option"